From c064808a1afb36bcec22c5a922e79606439b80bb Mon Sep 17 00:00:00 2001 From: Arnel Borja Date: Sun, 1 May 2011 08:13:45 +0300 Subject: [PATCH] Bypass libtool for linking with libuuid on win32 Fixes a regression introduced in 07d49ee5. Libtool by default refuses to link static libraries into shared libraries. In Windows, libuuid is however a static library and needed for shared libgtk; as a work around, use "-Wl,-luuid" to pass the option directly to the linker. https://bugzilla.gnome.org/show_bug.cgi?id=642214 --- gtk/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 5d9e5300ca..96817e8953 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -894,10 +894,9 @@ libgtk_3_la_LDFLAGS = $(libtool_opts) libgtk_3_la_LIBADD = $(libadd) libgtk_3_la_DEPENDENCIES = $(deps) -#libgtk_win32_3_la_LDFLAGS = $(libtool_opts) -Wl,-luuid - if USE_WIN32 -libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid +libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 +libgtk_3_la_LDFLAGS += -Wl,-luuid libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps) libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) endif -- 2.30.2